basic.c: Include string.h Makefile.am: -L$(top_builddir)/gdk-pixbuf/.libs

basic.c: Include string.h
Makefile.am: -L$(top_builddir)/gdk-pixbuf/.libs

diff --git a/modules/linux-fb/Makefile.am b/modules/linux-fb/Makefile.am
index f56f4ba344f9f6aefaf7b81f81c8c45f37fbf052..a2cde57e1e64dc880f4ab27a80e231e6f142c9d8 100644 (file)
--- a/modules/linux-fb/Makefile.am
+++ b/modules/linux-fb/Makefile.am
@@ -24,7 +24,9 @@ LDFLAGS = @STRIP_BEGIN@ \
 fb_basic_la_SOURCES = basic.c
 
 fb_basic_la_LDFLAGS = -export-dynamic -avoid-version -module
-fb_basic_la_LIBADD = $(PANGO_LIBS) -L$(top_builddir)/gdk/.libs -lgdk-linux-fb-1.3 -lgdk_pixbuf-1.3
+fb_basic_la_LIBADD = $(PANGO_LIBS) \
+       -L$(top_builddir)/gdk/.libs -lgdk-linux-fb-1.3 \
+       -L$(top_builddir)/gdk-pixbuf/.libs -lgdk_pixbuf-1.3
 
 if USE_LINUX_FB
 

diff --git a/modules/linux-fb/basic.c b/modules/linux-fb/basic.c
index b4b8b14a0aec1cec2453d441bf5da2f3869edf61..f712ab86babf0c1c7d894c41e96569b632510252 100644 (file)
--- a/modules/linux-fb/basic.c
+++ b/modules/linux-fb/basic.c
@@ -24,6 +24,7 @@
 #include <pango/pango.h>
 #include <pango/pango-utils.h>
 #include "gdkprivate-fb.h"
+#include <string.h>
 
 PangoGlyph
 pango_fb_get_unknown_glyph(PangoFont *font)